revert: revert: build: remove dependency on Python sass module
#34502
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kdmccormick
force-pushed
the
kdmccormick/libsass-python-3
branch
from
5705b42 to
75ed733
Compare
4 tasks
kdmccormick
force-pushed
the
kdmccormick/libsass-python-3
branch
3 times, most recently
from
0b3db6b to
65b84e8
Compare
This reverts commit a27cda2.
Fixes three NameErrors which were introduced by the previous commit, leading to it being reverted. These NameErrors slipped through because the script was not tested on any themes that had zero SCSS overrides.
kdmccormick
force-pushed
the
kdmccormick/libsass-python-3
branch
from
65b84e8 to
e2e48b2
Compare
kdmccormick
commented
Apr 12, 2024
feanil
approved these changes
Apr 12, 2024
This will be used to protect against bugs like the on fixed in the previous commit.
This will help safe-guard against bugs in the Sass and Webpack build which only arise from certain uses of the legacy Comprehensive Theming system.
This fixes the ability to pass custom theme directories to
the management command which compiles site themes, a la:
./manage.py lms compile_sass --theme-dirs /my/custom/themes/dir
The exception, which was due to a incompatible use of @lru_cache, was:
File "openedx/core/djangoapps/theming/management/commands/compile_sass.py",
line 93, in parse_arguments:
available_themes.update({t.theme_dir_name: t for t in get_themes([theme_dir])})
TypeError: unhashable type: 'list'
This has been broken since the @lru_cache decorator was added, but it
wasn't noticed because:
* We weren't compiling any comprehensive themes in CI.
* Tutor supports compehensive theming, but not *site theming*, so
it doesn't use this management command at all
(site themeing == comp theming * site configuration).
* Although edx.org executes this management command, it does not provide
use the `--theme-dirs` argument, so the bug was not hit.
kdmccormick
force-pushed
the
kdmccormick/libsass-python-3
branch
from
e2e48b2 to
101aead
Compare
|
2U Release Notice: This PR has been deployed to the edX staging environment in preparation for a release to production. |
|
2U Release Notice: This PR has been deployed to the edX production environment. |
1 similar comment
|
2U Release Notice: This PR has been deployed to the edX production environment. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR does five things, each separated into its own commit:
sassmodule #34439sassmodule #34476./themes/empty-theme, which can be used to trigger said NameError../themesin CI so that the NameError wouldn't have been introduced in the first place.compile_sassmanagement command, which I found when I began compiling themes in CI.Testing
Same as #34439
The improved CI check will provide additional confidence in the compile_sass.py script.
Merge considerations
High-urgency, as this blocks the Python 3.11 upgrade ( #34229 )